Fixed the whiteline removal for the schemaLocations when already properly migrated #855

Jenson3210 · 2025-09-23T11:53:23Z

Added some preconditional approach to the oldValue using regexes.

I am not sure though if this change is worth the "win" of not seeing the change happening.

Before this PR,

<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
          https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
         version="6.0">
    <display-name>Unit testing</display-name>
</web-fragment>

Would be migrated to

<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
         version="5.0">
    <display-name>Unit testing</display-name>
</web-fragment>

to than later be migrated back to version 6. (notice the newline diff resulting in the end causing unneeded reviewable change)

…erly migrated

Jenson3210 · 2025-09-23T11:54:14Z

@timtebeek As I mentioned above: not sure if we would even want this change. Introducing a bit "heavier" oldValue regex checks just for this purpose seems odd, no?

timtebeek

I think it's tolerable to have this change. optionally with a little less stringent prefix pattern on that particular faces 4 recipe.

timtebeek · 2025-09-23T13:40:01Z

src/main/resources/META-INF/rewrite/jakarta-faces-4.yml

      attributeName: xsi:schemaLocation
      elementName: web-app
-      newValue: https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd
+      oldValue: (?<prefix>https://jakarta\.ee/xml/ns/jakartaee\s+https://jakarta\.ee/xml/ns/jakartaee/web-app_)5_\d+(?<extension>\.xsd)


This is where I wonder if for clarity (and less chance of mismatches) we can use a simpler pattern of replacements.

Suggested change

oldValue: (?<prefix>https://jakarta\.ee/xml/ns/jakartaee\s+https://jakarta\.ee/xml/ns/jakartaee/web-app_)5_\d+(?<extension>\.xsd)

oldValue: (?<prefix>.*https://jakarta\.ee/xml/ns/jakartaee/web-app_)5_\d+(?<extension>\.xsd)

timtebeek · 2025-09-24T15:26:45Z

src/main/resources/META-INF/rewrite/jakarta-faces-4.yml

      attributeName: xsi:schemaLocation
      elementName: web-app
-      newValue: https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd
+      oldValue: (?<prefix>[\S\s]*https://jakarta\.ee/xml/ns/jakartaee/web-app_)5_\d+(?<suffix>\.xsd[\S\s]*)


A character group of [\S\s] would just mean anything right? Then .* feels more intuitive.

\s A whitespace character: [ \t\n\x0B\f\r] \S A non-whitespace character: [^\s]

.* does not match on \n where \s\S will match on these newline variations also. I did not get it to work with .* and the added unit test/newlines.

Ah guess that would require a multiline flag to be added; in that case we can go with this option, or prefix the regex with (?m) to make it explicit that we tolerate multilines as well

the multiline, I indeed also tried.

That would work if we do not expect the entire string to match. That matches the line (so as of the newline) that matches the string, not the entire value.
I did find that the dotall flag does match the entire surrounding values.

timtebeek · 2025-09-30T21:30:18Z

Any reason you'd held off on a merge here @Jenson3210 ?

Jenson3210 · 2025-09-30T21:31:56Z

Nope 🫣

…18.0 to 3.19.0 [skip ci] Bumps [org.openrewrite.recipe:rewrite-migrate-java](https://github.com/openrewrite/rewrite-migrate-java) from 3.18.0 to 3.19.0. Release notes *Sourced from [org.openrewrite.recipe:rewrite-migrate-java's releases](https://github.com/openrewrite/rewrite-migrate-java/releases).* > 3.19.0 > ------ > > What's Changed > -------------- > > * Fixing SDKMan tests by [`@steve-aom-elliott`](https://github.com/steve-aom-elliott) in [openrewrite/rewrite-migrate-java#858](https://github.com/openrewrite/rewrite-migrate-java/pull/858) > * Adopt `Style.from` instead of `SourceFile.getStyle` by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#859](https://github.com/openrewrite/rewrite-migrate-java/pull/859) > * Fixed the whiteline removal for the schemaLocations when already properly migrated by [`@Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-migrate-java#855](https://github.com/openrewrite/rewrite-migrate-java/pull/855) > * OpenRewrite recipe best practices by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#860](https://github.com/openrewrite/rewrite-migrate-java/pull/860) > * Update recipe documentation examples by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#864](https://github.com/openrewrite/rewrite-migrate-java/pull/864) > * Fix UseVarForGenericMethodInvocations for nested generics with diamond operators by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#863](https://github.com/openrewrite/rewrite-migrate-java/pull/863) > * Update documentation examples by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#865](https://github.com/openrewrite/rewrite-migrate-java/pull/865) > * Add explicit type arguments to generic methods in `UseVarForGenericMethodInvocations` by [`@jagodevreede`](https://github.com/jagodevreede) in [openrewrite/rewrite-migrate-java#869](https://github.com/openrewrite/rewrite-migrate-java/pull/869) > * Don't replace instance methods accessing static fields by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-migrate-java#871](https://github.com/openrewrite/rewrite-migrate-java/pull/871) > > New Contributors > ---------------- > > * [`@jagodevreede`](https://github.com/jagodevreede) made their first contribution in [openrewrite/rewrite-migrate-java#869](https://github.com/openrewrite/rewrite-migrate-java/pull/869) > > **Full Changelog**: <openrewrite/rewrite-migrate-java@v3.18.0...v3.19.0> Commits * [`da6ad68`](openrewrite/rewrite-migrate-java@da6ad68) Don't replace instance methods accessing static fields ([#871](https://github.com/openrewrite/rewrite-migrate-java/issues/871)) * [`357191e`](openrewrite/rewrite-migrate-java@357191e) Add explicit type arguments to generic methods in `UseVarForGenericMethodInvo... * [`45e12e2`](openrewrite/rewrite-migrate-java@45e12e2) [Auto] SDKMAN! Java candidates as of 2025-10-06T1015 * [`c89ae45`](openrewrite/rewrite-migrate-java@c89ae45) Update documentation examples ([#865](https://github.com/openrewrite/rewrite-migrate-java/issues/865)) * [`c1ac90b`](openrewrite/rewrite-migrate-java@c1ac90b) Fix UseVarForGenericMethodInvocations for nested generics with diamond operat... * [`9092d22`](openrewrite/rewrite-migrate-java@9092d22) Update recipe documentation examples ([#864](https://github.com/openrewrite/rewrite-migrate-java/issues/864)) * [`640ac12`](openrewrite/rewrite-migrate-java@640ac12) OpenRewrite recipe best practices ([#860](https://github.com/openrewrite/rewrite-migrate-java/issues/860)) * [`2fd7b1b`](openrewrite/rewrite-migrate-java@2fd7b1b) Fixed the whiteline removal for the schemaLocations when already properly mig... * [`75b6048`](openrewrite/rewrite-migrate-java@75b6048) Adopt `Style.from` instead of `SourceFile.getStyle` ([#859](https://github.com/openrewrite/rewrite-migrate-java/issues/859)) * [`7082b93`](openrewrite/rewrite-migrate-java@7082b93) Fixing SDKMan tests ([#858](https://github.com/openrewrite/rewrite-migrate-java/issues/858)) * Additional commits viewable in [compare view](openrewrite/rewrite-migrate-java@v3.18.0...v3.19.0) [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility\_score?dependency-name=org.openrewrite.recipe:rewrite-migrate-java&package-manager=maven&previous-version=3.18.0&new-version=3.19.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Jenson3210 added 3 commits September 23, 2025 13:47

Fixed the whiteline removal for the schemaLocations when already prop…

17867a8

…erly migrated

Fixed the whiteline removal for the schemaLocations when already prop…

83f3d37

…erly migrated

Fixed the whiteline removal for the schemaLocations when already prop…

6e9bae9

…erly migrated

Jenson3210 self-assigned this Sep 23, 2025

moderne-meeseeks bot added this to OpenRewrite Sep 23, 2025

github-project-automation bot moved this to In Progress in OpenRewrite Sep 23, 2025

timtebeek approved these changes Sep 23, 2025

View reviewed changes

github-project-automation bot moved this from In Progress to Ready to Review in OpenRewrite Sep 23, 2025

timtebeek reviewed Sep 23, 2025

View reviewed changes

Better matching

c290ea4

timtebeek reviewed Sep 24, 2025

View reviewed changes

Better matching

2caf18d

timtebeek approved these changes Sep 24, 2025

View reviewed changes

Jenson3210 merged commit 2fd7b1b into main Sep 30, 2025
2 checks passed

Jenson3210 deleted the fix-whiteline-introduced branch September 30, 2025 21:31

github-project-automation bot moved this from Ready to Review to Done in OpenRewrite Sep 30, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fixed the whiteline removal for the schemaLocations when already properly migrated #855

Fixed the whiteline removal for the schemaLocations when already properly migrated #855

Uh oh!

Jenson3210 commented Sep 23, 2025 •

edited by timtebeek

Loading

Uh oh!

Jenson3210 commented Sep 23, 2025

Uh oh!

timtebeek left a comment

Uh oh!

timtebeek Sep 23, 2025

Uh oh!

timtebeek Sep 24, 2025 •

edited

Loading

Uh oh!

Jenson3210 Sep 24, 2025

Uh oh!

timtebeek Sep 24, 2025

Uh oh!

Jenson3210 Sep 24, 2025

Uh oh!

timtebeek commented Sep 30, 2025

Uh oh!

Uh oh!

Jenson3210 commented Sep 30, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	oldValue: (?<prefix>https://jakarta\.ee/xml/ns/jakartaee\s+https://jakarta\.ee/xml/ns/jakartaee/web-app_)5_\d+(?<extension>\.xsd)
	oldValue: (?<prefix>.*https://jakarta\.ee/xml/ns/jakartaee/web-app_)5_\d+(?<extension>\.xsd)

Fixed the whiteline removal for the schemaLocations when already properly migrated #855

Fixed the whiteline removal for the schemaLocations when already properly migrated #855

Uh oh!

Conversation

Jenson3210 commented Sep 23, 2025 • edited by timtebeek Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Jenson3210 commented Sep 23, 2025

Uh oh!

timtebeek left a comment

Choose a reason for hiding this comment

Uh oh!

timtebeek Sep 23, 2025

Choose a reason for hiding this comment

Uh oh!

timtebeek Sep 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Jenson3210 Sep 24, 2025

Choose a reason for hiding this comment

Uh oh!

timtebeek Sep 24, 2025

Choose a reason for hiding this comment

Uh oh!

Jenson3210 Sep 24, 2025

Choose a reason for hiding this comment

Uh oh!

timtebeek commented Sep 30, 2025

Uh oh!

Uh oh!

Jenson3210 commented Sep 30, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Jenson3210 commented Sep 23, 2025 •

edited by timtebeek

Loading

timtebeek Sep 24, 2025 •

edited

Loading